added users to collaborators and cleaned up the rest of the code