Moved alert from status into separate module and more cleanups