#916 Additional coding conventions changes