Reformatted all of the queries to be more Coffeescript