clean up & add a few override annotation