simple refactor

edit comments, removed commented out code