S-01057: Technical: Code Refactoring