Remove self(implicit receiver), Remove spacing issues