Add property enconde utf-8
Remove all code comments