Starting to clean up a few things, make this thing look good