code cleanup, updates, etc