team code cleanup and review
Merge pull request #44 from Ank13/review

team code cleanup and review