more abstract tweaking and shortening