Fixed some previously done refactoring.