Simplify logic for saving unit