limit coverage package, some formatting and review notes on other helpers