More Refactoring to make neater