Improved code reaadability