Updated references and reduced un-needed functions in definitions