Refactoring project bades