Imporved code readability