regex cleanup; fixed indenting on partials