quotes and bool refactors