code style refactors