Cosmetic changes

Code modernization.