Revert "Revert "Revert "Revert "fixed class declaration""""

This reverts commit 51bf302e13d8fde2bf1ec2c8b3e6e7409b4c2487.