Minor refactoring & added words to json file.