Sample cleanup

Just cleaning up some small issues