Small changes after reviewing code on GitHub