Refactoring
More meaningful function names
Fix detection of odd quotes