took out whitespaces, clean up code