Minor refactor.
Clean up constructor api.
Extract class & interface for static fields and properties.