Minor changes
Refactor.