Corrections

Corrected the null (but I think I missed some of them) and the empty line between package and import