Refactor mutation method into smaller methods & prettify