Improved code redability