fix/clean