simplifying code and making gocov happier