cleaned up code

doesn't run properly