Cleaned up beans, moved coordinates to their own bean
Moved logic for matching alert id's with alerts into service class