Cleanup comments, rearrange setup
Fix comments