Fixes unneeded complexity