Updating superfluous calls in logic checks and removing unnecessary loop in Orientation.forName