t14: Cleaning code