King - improving readability by using constants for temp classes; added an implementation of all for Incident