little changes during Code Review, please look inside