clean up, entry point rename