Cleaned up Init/Shutdown