Did more small work
Revert "Did more small work"

This reverts commit b6f0345bbfb8c1a00c938b784367fbb1a771932a.