refactor settings integration

* fixed some unsightly units from my previous PR like adding
the Cms::Fortress namespace and removing unneccessary return
statement