Code Cleanup

Performed some code cleanup, such as updating copyrights.