some code cleanup and give up on coveralls for now