Further refactoring for style