Correcting dependencies
Formatted using VTK style
API corrected
Updated according to new API