Cleaning up

cleaned up code as recommended