Issue #25 - even moar code review changes