Feature/cleanup detail