More cleanup of setup method/ break into functions