Cleaning and optimizations.

Including variable renaming and loop merging.

Signed-off-by: George Bosilca <[email protected]>

Author: bosilca