mariusl - major cleanup (directely done on dash)