Removed useless verbose stuff about charges, and some very small cleanup