Feature/clean