Misc cleanup

- Convert file_list to a list to get rid of the trailing \n
- Remove useless self.include check