improve coding styles