Fix formatting + update lock

Signed-off-by: Samuel Monson <[email protected]>

Author: sjmonson