Revert "improved representation"

This reverts commit befa6568d5d1b8b7451bec33b2191adfa86d831f.
Revert "Revert "improved representation""

This reverts commit ed9d490df079e098f1b66ec9ca4af3b40ea8ab29.