small design tweaks
Merge pull request #2015 from awesomerobot/master

small design tweaks