Plan spec passing
Clean up formatting