Cleaned up refactored.