Cleanup and copyright added to more files