Do some style refactoring