Cleaning up a little bit to add more structure.