Code refactor part I [classification][completed]