editted author tag
pulling
minor refactoring