code cleanup; norm support in objective