Further code style changes