Refactor spaces in syntax