Enhanced code formatiing