Simplify and begin documenting message classes