reformatted messages-struct
sourcetree cleanup