Put public methods up front
:lipstick: Refactor the code