Fix inconsistent quotes
Refactor if statement
Merge pull request #178 from rafalchmiel/master

Fix inconsistent quotes and refactor an if statement