Cleaned up HandleAnnounceCommand code