Added more words to spam and code refactor