Moving all badge alterations into helper functions