updated

cleaned up the code