General clean-up. Added re-init function