Change: Removed an or operator that is no longer needed
Enhancement: A bit of code cleanup