Updated copyright and performed some minor code reformats.