1908: Cleaning code