Removed comments, edited settings comments & layout