Refactoring, created sample app.