MainBookChoice Adjusted + code cleaning