cleanup and get example working