Cleanup

Cleanup for code sample / display purposes.