FIX: minor code cleanup.