small tweaks to clean up code
Merge branch 'development'