[core] Remove ; and clean