fixed indentation, removed commented out code