fixing readability
a whole lot
about to build message controller