Perform automatic formatting

Also remove non-null parameter.

Got owned by Nate because i'm stupid!