Move var. declaration to allow further clean up