Code cleanup
Code cleanup
Fixes for alert refresh