unified quotes, and formating, ready to next step refactorying