cleanup: formatting and comments