small performance update
clear code
small fix