#235 Improved coding style and method names