Code makeover