nicer annotations by default, slight annotation refactor