changed names and cleanup