Light refactoring and started on Class B simple send implementation