Refactor :sparkles: