Comment fix
Simple refactoring
Update tests
Add quotes processor