Minor code cleanup in EVA controller