Revert "slight cleanup"

This reverts commit 3030cbbfb8dc59cc8aa2e6922bcd17667c7029b5.