cleaned up code a bit more