Removed a redundant class from MessageReader.
Renamed some things to make it more clear.