screenshot and minor update
code refactor
switch completer working fine
Refactored