Improve internal functions readability.