Tremendous code reformat and cleanup
Rewrite Messages#load, stop reinventing the wheel