applied minor fixes suggested by @mmaker