KISS refactoring and some text formatting.