Further code formatting updates