Small changes

Code optimization.