Cleaned up methods. Minor refactoring.