Improve the readabiliy of codes mainly