refactor and remove needless codes
add custom data fields into actor
modify arguments for add-state!