patch #122 code style cleanup and method rename