Cleaned up solution structure