More cleanup. Add license header