Simplify annotations