Clean-up code fix