Clean up code

Clean code is a sign of a lazy programmer.