cleaning A LITTLE the mess of previous 2 commits

at least now only one place is a mess