Refactor some logging
Enhance README