Moved "Type" to top of class