Make syntax consistent