Minor cleanup: Use Status enums instead of strings