dev/core#1722 code style cleanup