Messages cleanup

This is a fairly simple cleanup. Objects should be created, retrieved and ordered in controller layer, so that's what we're gonna do.