Remove redundant specs and explicit self returns from priv classes