Cleaned up on the output