More cleanup, nothing mayor. Working towards file creation goal