Refactory some models