Added copyright notices

And small cosmetic / indentation fixes