- code clean up
- support Undergraduate/Masters tag coming from badges server response