Remove static function. Use unnamed namespace to wrap these function
Merge branch 'arrange' into develop