file clean-up, remove commented code and whitespace