cleaned up settings and comments