No change, cleaning up code