NOREF:: Doing a little more condensing and tidying up