updated license and cleanup