Fixing code according to the code style audit.