Code review for shaker