cosmetic changes
done encoding and decoding
removed/renamed
removed/renamed