more formatting and tweaking