cleaning up the code
Merge branch 'master' of https://github.com/justia02/PSI-team-3