Refactor method names and documentation