Cleaned up process-management