Re-ordering methods. Minor refactoring.