TOP: Small refactoring