Improve coding tyle