revert previous changes, add formatting