Clean clode
Rename public methods