+ Major cleanup
+ Added FIXME comments