Fixed all the code to look pretty.