More stylistic 'refactoring'