refactor code 1
Merge pull request #17 from kynm/task_team

refactor code 1