Tidied up the announce mechanics with better usage of a map.