cleaned up the code a little bit