small cleanup and ready up for test