Cleaned up classes, added correlated modifiers.