refactoring
* update from Mozilla moved to Contact prototype
* some comments added/modified