code cleanup
Improvements based on @tribal-tec review
Improvements based on @tribal-tec review
Merge pull request #60 from eile/master

Improvements based on @tribal-tec review