Tidy up to remove spaces and fix plugin