Tidies up James' class diagram