Took out some whitespace and moved some code.