Further JavaDoc improvements and minor code clean ups.