Minimum refactor and added highlighting for text