did a little clean-up, tried to make it a little prettier