Added coverage info and made some cleanup