Copyright updates / minor code cleanup