Moved public methods on top