Small cleanup
Some default facades