Housekeeping, cleaning up comments and license notices