[minor] Small code style refactors