further translation and code style updates