code cleanup, analytics