Added factory base to util and fixed a spacing issue