You're right, it's much cleaner

https://github.com/natebrennand/data.adicu.com/commit/3fb342e982f02fefe270efd928d2cdb251118520