Renamed variables
Added comparisons and operations
Using operations internally