Refactor feature run logic

close #13