improved coding style