reorder code in a couple of models