cleaned up some naked calls to fs methods for consistency