Added few other examples and another code cleanup