removed some baroqueness