Review (5/5): Less work
Easy cleanup