Badge: refactor
TODO: Updated