refactoring
license header
imports cleanup