Committed some refinement