Code clenup.