CF 18 Enhances code by improving code readibility
https://vinsol.atlassian.net/browse/CF-18