cleanup
added compose instead of msg