Minor refactoring + removed commented out code