cleanup of repeated stuff