Renamed some hidden methods
Some refactoring