Cleaning up code and creating a team taxonomy.