MXR-159 format with optimize import
MXR-160 rearranging code