removed unnecessary members
some refactoring
Merge branch 'master' of github.com:dwsoto/SWE