beautify + start of fix