Improved code layout style