Turn builder constructors into their own functions

Thanks to kamatsu on reddit for the suggestion