cleanup and adding license header