Fixed style problems.
Merge branch 'sam_style' into next