Code formatting improved