#7 Small changes of code