Reduce logging
Tidying up
Reduce logging
Refactoring