fix class declerations