renetassy: some refactoring