refactoring to make things more useful as a result of working on opsbot