Tidying license notice
Tidying code