Code standardization and projection improvement (work in progress)