Further code re-arrangement