Improve source code readability