Clean up
#62 Revert back some facades method