Cleaning up some of the syntax