Getting ready for going forward
Fix ups to make code nicer.