Feature/clean up logging