removing some repeated stuff