code refactoring, annotation reader progress