Changed placeholder generation, small cleanup