refactoring part 1
refactoring done
Merge pull request #11 from gopher-snakes-2013/team_refactor_1

Team refactor 1