Improve readability in the code