Code cleanup and fixes.
Fixed formatting on sample data.