Refactor and added space after row hints