cleaned up structure class