Small cleanups
Work in progress on the sample app