Further code style improvements