Clean up logger and spaces