Improved code style: naming conventions and qualifaers.