Class diagram cleanup part 1

im sexy and i know it