cleaned up code

here you go