Added announcement and cleaned up code