Organized the whole thing to make it easier to work with.