Beautify the code some.