Updated some copyright lines
Code cleanup
Updated the copyright line