cleanup - using more impl's, to shorten function names