Minor update regarding shell history file
Minor code refactoring
Implementation for an Issue #832