refactor annotation attributes