little style tweeks
Merge branch 'development'