Addressed review comments: Fixed imports, removed assertions, added
missing file header.