Small updates
Replaced divide with a shift