Cleaner, faster code