Refactoring after inspection of code
Added samples for app