Remove dead code and add some whitespace