some style improvements
some style improvements