Feature/issue 10 cleanup