Clean up code
Write string announcement specs