Back to using to_long, cleaned up formatting