More proper (15/48)

More proper