Example cleanup 

Cleaned up examples pr. feedback from  @bmunkholm