View in progress + cleaning code