Code modernized