license header added / code clean up