JSDocs and some clean up.