Last fixed regarding format/style and optimize imports