Clean up Element.java