cleaned up the look of the code a bit