Some code styling fixes