STYLE: corrected style issues
STYLE: removed commented lines
BUG & STYLE: ITK4 compatibility and style issues fixed