Improved code appearance