fix format
format fixes
in progress