update: code clean up