Final commit - cleaning the code

with help from everyone on the team