renamed some stuff and cleanup