improve consistency of file/function
improve readability