Clean-up logging and introduce logging levels