addressing import and naming comments