Indents, comments, and bye-bye old code