Issue #25 - moar code review changes