Minor: Code cleanup and re-ordering messages - refs BT#7010