updated Walker class per Issue #11 suggestion
cleaned up code