Refactored codes and files.