Cleanup, shortening of shift method