Making some minor mods to these files as I begin the transition into groovy