dev
Refactoring
Refactored using fragments
dev