Updated trim and spelling