cleaned up code for organization, added new items