Clean up teambuilder source
Merge pull request #91 from TheUnknownOne/design

Clean up teambuilder source