Move constant
Consistent annotation order