remove confusing copies
refactoring
newlines