Code styling fixes