Some cleanup (rename some methods and remove unused ones)