Small updates and cut down for consistency