Cleaning up some syntax