Clean up
Merge branch 'stub-styles'