Minor conciseness improvements, renames by @coderhaoxin