Consolidated code in response to feedback