Filip Gawin Refactor badges