Settings file with debug macro
Small cleanup