Store threads in Info struct, some minor cleanup/reorganization