Style updates

@monfresh ready for merge