fix some scrutinized code :)