mdj1412
Code Refactoring: Removing duplicated code and optimizing performance.
a9c229f