Refactor binary to allow file evaluation