Refactoring
Added examples