General cleanup; docBlock improvements.