Consolidated some stuff