more revamping

Signed-off-by: Fred Bricon <fbricon@gmail.com>