cleaned up a little bit

just to make stuff more readable, etc