Refactor of singleton creatons into their respective helpers.  Removal of resolved comments.