improve code style according to convention