modify some annotation, and cleanup