Small changes in code