Code was simplified