Simple cleanup of code and better descriptions.