fix style nits and remove commented out code