Minor Code Refactoring