DC: roottools refactoring, clean whitespaces

Change-Id: If63aceb0d41ec9fc6a9b8c36758595ea95e61b25