Minor visual refactoring