fixed encoding
code format & static analys fixes