Starting to clean up a bit