added some type shortening