Removed advanced setting and cosmetic fixes

Removed advanced setting.
Fix indenting, and reduce comments.