Typo fix and replacing more strings with variable