further style improvements