PR tidy

* remove reference to internal name, Facia
* use safer Option constructor instead of Some