more formatting; cleaning up 'var's