updating ticket #267 to improve coding style