Improved code look