V0.5.5: [clean] reformat code & minor clean up