Improved code lisibility and performance