Cleanup and added licence headers