minor fixes on code style