Refactored multiple files.