initial refacroting
fixed json properties reading
fix