refactor badges class and edit parser