Replace Facade usage with helpers, clean up spacing and style, adjust head items to better match conventions
Signed-off-by: Micheal Mand <micheal@kmdwebdesigns.com>