Last uncommitted changes - refactor