Cleaning up some syntax to make it shorter and a little easier to see
what's up