few refacoring
license update