code refactoring, fixing help options