Starting to clean up the way things look