cleanup, updated license