Small Code Refactoring
Small refactoring