Cleaning up logging statements
Cleaning up tabs & spaces