closes #30 and makes log messages more consistent