Feature/project cleanup