Multiple fixes
1. fixed announcement bug
2. formatted code