Reduced nested complexity
Removed checks that are already covered by parent method