added type
cleaned up