removed commented out code/changed default name