Fix inline docs and rename methods to reflect code style guidelines