Incapsulation fixed and clean up