cleaned up code

cleaned up code