renaming some variables; some static importing