More code styling fixes...