MOD: code clean up