Organized the code a little more.