Refactor the class place