Feature/cleanup