clean up: removed uncommented code, formatted