Improved source readability