Revert "minor design changes"

This reverts commit 45c8dd5eadad176c3480c9c70511d94cca4ec98e.