remove unused underscore from shared folder
small rewrite to avoid continue statements
WIP message system