code cleanup / re-formatting