Simplify shift method avoiding unnecessary condition