re-refactoring
examples fixed