code cleanup, function selection