Refactoring of Cray NPPCU logic, simpler code