[Fix] Fix & clean