Refactory a little bit.