Fixed some formatting and added logging for the choices module.