Cleanup and improve on ElementsII