#175: Small refactoring