Refactoring due to slight adjustment on ODIN file reader