make thing more logical and uniform.