Remove commented code; Rename method for clarity; Remove whitespace changes