Merge "Code cleanup" into main