Refactory continue