refactor

refactor
consider clean path

consider clean path