Remove unnecessary namespace qualifiers
Update contact information in comments