Removed raw-message struct and updated some of the line processing logic