Review: code clean up and full element for badge