code cleanup, updated license year