code reductions
more code reduction