Revert "interesting..."

This reverts commit 24d5be0558edc3dfa7609dc1059031a23d7a6b0b.
Added class comments