Removing double processing of values