Remove unneded @author comments, add Override annotation