Removed some python bits.
Little restructuring.
Few tweaks.