More cleaning code to match standard #3