Reformatted Code Structure [#66830640]