Add function return value comments.
Reorder methods for consistency.
Add ChartBuilder test.