More Cleaning code
Fixed Structure class
Optimized dynamic class