Minor refac for FileHandler class