More code cleanup for yard & simplecov