modifications based on Tillerino's suggestions

suggestions here:
https://github.com/Tillerino/Tillerinobot/issues/5#issuecomment-57489890