Fixing identation. Using new g2dcomponent macro