Removes extra code.
Some cosmetic changes.