Refactoring & remove underscore prefix from method and property names