Code refactory...