No more dodgy code