polish some methods