minor code formatting
improve some misleading method names