Hacks become cleaner!