Clean up element better