Cleaned up unnecessary branching when calculating with width/height of a hexagon