Add class diagram, made cosmetic changes