More text cleanup and refactoring..