Bugfix: string append did nothing
Simplify return code
Simplify return code
Simplify return code