Cleaned up the encoding format