Improves some class names; adds comments