cleaned up code a little bit.