code improvements. (coding style)