Small refactoring done