Code format and imports optimization