Clean up: Use (instancetype) instead of (id)