Moved public methods to top