Format edits

Preparing for final 2 methods