Remove commented code; formatting