Final Sprucing up of the program