[BONOBO] Code reformat, Imports optimization.