Small changes. More like refactoring.