improved coding style of last commit