Refactor + LogMacro
some demo fix