Minimize uses of @