1.3

cleaned up the code a little bit