updated formatting and improved coverage