Fix some style issues identified during review