Gin Refactor