style/consistency fixes