Import fixes; requests now optional in common.
style refactor