Clean up logging

Clean up from #29, prompted by @minrk.