Refactor of types removing setters / getters