Improve readabiliy