errcheck cleanup