Refactoring Bot almost done