Small changes of code