Clean Code Review: Removing All the Extra Types