Clean code to improve readability