Some refactoring, also found out that this library 'hachoir' was made by monkeys