Cleanup, comments
Minor changes, settings to tackle level 29