Clean-up the new code a bit