Refactor steven comments