Consistent arrangement of branch definitions
Remove unnecessary temp variable