refactoring
make sure that "Issa O'Brien" works issue #63