refactoring
merged
Refactoring
Deleted pics