Minor changes about code style