Tidying up, namedtup instead of object