few fixes for style