Refactor place sector machine'