Address Early Adpoter's feedback

This PR addresses all of the points in the feedback as discussed in #8, for @honzajavorek to review & merge