cleaned up code a little more