removed commented out code for final submission