Minor nits

Code clean up and updated descriptions.