Refactoring logging and working on presentation
Tweaking
Formatting: some vertical space to improve readability