refact #1