clean up codes
update prefix def for function