Cleaning up logging outputs and TODOs