Cleanup and a few more lines covered