Clean up

Cleaned up modifiers, syntax, some misc things