Remove unnecessary code & whitespace