clean up object commands and make it easier to understand.