Minor Refactoring done