More Code Refactoring!