Removing whitespace and cleaning a couple of things up.