Moved all public methods to top