Start of refactoring
Improve logging output
Add hit bonus strategy