some formatting and tweaks