Refactor aqua