code tidy, remove farbtastic