Meter, small, and code clean up.