fix bug + clean