Cleaned up a few of the lines of code.