reindent and remove old comments
working on pre optim