Added checking for whole word in uppercase