More liberal use of final, and adding @author comment