Cleaning up the syntax