Refactoring shake logic in bombard.