codes clean up