Refactoring
Adding screenshot