Refactor again and again :sparkles: