Small changes based on code comments