cleaned up Message