Refresh fix
Reformat, small fixes