Feature/cleaning