Small changes code cleanup.