Adding a clear method and ordered some methos.