Fix class comments
Prepare for messages