Simplify vector stuff and add missing return type