Issue 118

- Removes unused temp var
- Splits a assignement+send message in two statements