Move public methods to source file