cleaned up styles
Merge branch 'master' into ryan