more more refactoring for drums core
All tests passed for drums after refactoring
minor log format change for testing