Made changes as per feedback in #126