Inline static methods used only once
Refactor constructors