*8759* Code reuse improvements and cleanup