minor formatting and performance changes