Move optional prepration to separate method