more OOP-like
renaming messages