Created by: attfarhan
Addresses comments made on https://github.com/sourcegraph/sourcegraph/pull/2027