Clean-up on log plugin (#90) - not completely fixed yet