Code formatting - part 2