Minor refactoring & styling.