- Cosmetics
- Removed wrong NO_INIT_VTABLE usage
- Cosmetics
- Clean up
- Cosmetics