Improve source readability