Feature/cleanup application