Optimized structure because of @jhbruhn