Settings Cleanup, including phpdoc