This is way cleaner :package: