Prettification part 2